Enterprise Version
fixing leakage from pipe
More